Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-05 23:22:47 +00:00
Code Releases Activity

Updates dependencies to latest versions

Browse Source
This commit is contained in:
Rogiel Sulzbach
2012-03-25 10:41:02 -03:00
parent ef39f3c67e
commit ed2b948dac
20 changed files with 8351 additions and 8346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
l2jserver2-common/pom.xml
View File

@@ -86,7 +86,7 @@
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId> <artifactId>ehcache-core</artifactId>
<version>2.5.0</version> <version>2.5.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- utils --> <!-- utils -->
@@ -99,7 +99,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>11.0</version> <version>11.0.2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -111,7 +111,7 @@
<dependency> <dependency>
<groupId>commons-pool</groupId> <groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId> <artifactId>commons-pool</artifactId>
<version>1.5.7</version> <version>1.6</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -130,7 +130,7 @@
<dependency> <dependency>
<groupId>com.mysema.querydsl</groupId> <groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-sql</artifactId> <artifactId>querydsl-sql</artifactId>
<version>2.3.0</version> <version>2.3.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -143,19 +143,19 @@
<dependency> <dependency>
<groupId>com.orientechnologies</groupId> <groupId>com.orientechnologies</groupId>
<artifactId>orient-commons</artifactId> <artifactId>orient-commons</artifactId>
<version>1.0rc7</version> <version>1.0rc8</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orientechnologies</groupId> <groupId>com.orientechnologies</groupId>
<artifactId>orientdb-core</artifactId> <artifactId>orientdb-core</artifactId>
<version>1.0rc7</version> <version>1.0rc8</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.3.162</version> <version>1.3.165</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@@ -168,25 +168,25 @@
<dependency> <dependency>
<groupId>de.schlichtherle.truezip</groupId> <groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-kernel</artifactId> <artifactId>truezip-kernel</artifactId>
<version>7.4.3</version> <version>7.5</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.schlichtherle.truezip</groupId> <groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-zip</artifactId> <artifactId>truezip-driver-zip</artifactId>
<version>7.4.3</version> <version>7.5</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.schlichtherle.truezip</groupId> <groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-driver-file</artifactId> <artifactId>truezip-driver-file</artifactId>
<version>7.4.3</version> <version>7.5</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.schlichtherle.truezip</groupId> <groupId>de.schlichtherle.truezip</groupId>
<artifactId>truezip-path</artifactId> <artifactId>truezip-path</artifactId>
<version>7.4.3</version> <version>7.5</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
l2jserver2-common/src/main/java/com/l2jserver/service/database/orientdb/AbstractOrientDatabaseService.java
View File

@@ -270,7 +270,7 @@ public abstract class AbstractOrientDatabaseService extends
CSVUtils.parseCSV(path, new CSVMapProcessor<Object>() { CSVUtils.parseCSV(path, new CSVMapProcessor<Object>() {
@Override @Override
public Object process(Map<String, String> map) { public Object process(Map<String, String> map) {
final ODocument document = new ODocument(database, entity final ODocument document = new ODocument(entity
.getTableName()); .getTableName());
for (final Entry<String, String> entry : map.entrySet()) { for (final Entry<String, String> entry : map.entrySet()) {
document.field(entry.getKey(), entry.getValue()); document.field(entry.getKey(), entry.getValue());
@@ -602,7 +602,7 @@ public abstract class AbstractOrientDatabaseService extends
if (testDesire(object)) if (testDesire(object))
continue; continue;
row.setDocument(new ODocument(database, entity.getTableName())); row.setDocument(new ODocument(entity.getTableName()));
mapper.insert(entity, object, row); mapper.insert(entity, object, row);

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

@@ -133,7 +133,7 @@ public abstract class AbstractSQLDatabaseService extends
/** /**
* The database connection pool * The database connection pool
*/ */
private GenericObjectPool connectionPool; private GenericObjectPool<Connection> connectionPool;
/** /**
* The dayabase connection factory * The dayabase connection factory
*/ */
@@ -200,7 +200,7 @@ public abstract class AbstractSQLDatabaseService extends
"DatabaseEngine instance not found", e); "DatabaseEngine instance not found", e);
} }
connectionPool = new GenericObjectPool(null); connectionPool = new GenericObjectPool<Connection>(null);
connectionPool.setMaxActive(config.getMaxActiveConnections()); connectionPool.setMaxActive(config.getMaxActiveConnections());
connectionPool.setMinIdle(config.getMinIdleConnections()); connectionPool.setMinIdle(config.getMinIdleConnections());
connectionPool.setMaxIdle(config.getMaxIdleConnections()); connectionPool.setMaxIdle(config.getMaxIdleConnections());

3
l2jserver2-gameserver/data/template/npc.xsd
View File

@@ -276,7 +276,8 @@
<xs:element name="skill" maxOccurs="unbounded"> <xs:element name="skill" maxOccurs="unbounded">
<xs:complexType> <xs:complexType>
<xs:sequence /> <xs:sequence />
<xs:attribute name="id" type="skill:SkillTemplateID" use="required" /> <xs:attribute name="id" type="skill:SkillTemplateID"
use="required" />
<xs:attribute name="level" type="xs:int" use="required" /> <xs:attribute name="level" type="xs:int" use="required" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>

3
l2jserver2-gameserver/l2jserver2-gameserver-core/pom.xml
View File

@@ -55,12 +55,11 @@
<version>0.5.3</version> <version>0.5.3</version>
</plugin> </plugin>
</plugins> </plugins>
<!-- <removeOldOutput>true</removeOldOutput> -->
<args> <args>
<arg>-extension</arg> <arg>-extension</arg>
<arg>-Xinheritance</arg> <arg>-Xinheritance</arg>
</args> </args>
<schemaDirectory>data/template</schemaDirectory> <schemaDirectory>${project.parent.basedir}/data/template</schemaDirectory>
<schemaIncludes> <schemaIncludes>
<include>*.xsd</include> <include>*.xsd</include>
</schemaIncludes> </schemaIncludes>

72
l2jserver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode
View File

@@ -2,26 +2,48 @@
<jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> <jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb">
<!-- <!--
This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
Any modifications to this file will be lost upon recompilation of the source schema. Any modifications to this file will be lost upon recompilation of the source schema.
Generated on: 2012.01.19 at 03:37:11 PM BRST Generated on: 2012.03.25 at 10:36:48 AM BRT
--> -->
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
<jaxb:schemaBindings map="false"/> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:character"> <jaxb:bindings scd="tns:character">
<jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/> <jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/skill">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:skill">
<jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::"> <jaxb:bindings scd="x-schema::">
<jaxb:schemaBindings map="false"/> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="~CalculatorFunction"> <jaxb:bindings scd="~CalculatorFunction">
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/> <jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/>
</jaxb:bindings> </jaxb:bindings>
@@ -38,26 +60,10 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST
<jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/> <jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:item">
<jaxb:class ref="com.l2jserver.model.template.ItemTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
<jaxb:schemaBindings map="false"/>
<jaxb:bindings scd="tns:npc">
<jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
</jaxb:bindings>
</jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="zones"> <jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
<jaxb:schemaBindings map="false"/> <jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:zones"> <jaxb:bindings scd="tns:zones">
<jaxb:class ref="com.l2jserver.model.template.Zones"/> <jaxb:class ref="com.l2jserver.model.template.Zones"/>
</jaxb:bindings> </jaxb:bindings>
@@ -65,5 +71,13 @@ Generated on: 2012.01.19 at 03:37:11 PM BRST
<jaxb:class ref="com.l2jserver.model.template.ZoneType"/> <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
</jaxb:bindings> </jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>
<jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
<jaxb:schemaBindings map="false">
<jaxb:package name="com.l2jserver.model.template"/>
</jaxb:schemaBindings>
<jaxb:bindings scd="tns:teleports">
<jaxb:class ref="com.l2jserver.model.template.Teleports"/>
</jaxb:bindings>
</jaxb:bindings>
</jaxb:bindings> </jaxb:bindings>

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

@@ -1,48 +1,48 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType; 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> * <pre>
* &lt;complexType name="AbstractTemplate"> * &lt;complexType name="AbstractTemplate">
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "AbstractTemplate") @XmlType(name = "AbstractTemplate")
@XmlSeeAlso({ @XmlSeeAlso({
ItemTemplate.class, ItemTemplate.class,
ActorTemplate.class, ActorTemplate.class,
SkillTemplate.class, SkillTemplate.class,
com.l2jserver.model.template.Teleports.Teleport.class com.l2jserver.model.template.Teleports.Teleport.class
}) })
public abstract class AbstractTemplate public abstract class AbstractTemplate
implements Template implements Template
{ {
} }

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

@@ -1,44 +1,44 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType; 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> * <pre>
* &lt;complexType name="ActorTemplate"> * &lt;complexType name="ActorTemplate">
* &lt;complexContent> * &lt;complexContent>
* &lt;extension base="{}AbstractTemplate"> * &lt;extension base="{}AbstractTemplate">
* &lt;/extension> * &lt;/extension>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "ActorTemplate") @XmlType(name = "ActorTemplate")
@XmlSeeAlso({ @XmlSeeAlso({
CharacterTemplate.class, CharacterTemplate.class,
NPCTemplate.class NPCTemplate.class
}) })
public abstract class ActorTemplate public abstract class ActorTemplate
extends AbstractTemplate extends AbstractTemplate
{ {
} }

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

@@ -1,148 +1,148 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType; 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> * <pre>
* &lt;complexType name="CalculatorFunction"> * &lt;complexType name="CalculatorFunction">
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/> * &lt;element name="set" type="{}CalculatorFunctionOperation" minOccurs="0"/>
* &lt;element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/> * &lt;element name="add" type="{}CalculatorFunctionOperation" minOccurs="0"/>
* &lt;element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/> * &lt;element name="subtract" type="{}CalculatorFunctionOperation" minOccurs="0"/>
* &lt;element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/> * &lt;element name="random" type="{}CalculatorFunctionOperation" minOccurs="0"/>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "CalculatorFunction", propOrder = { @XmlType(name = "CalculatorFunction", propOrder = {
"set", "set",
"add", "add",
"subtract", "subtract",
"random" "random"
}) })
public class CalculatorFunction { public class CalculatorFunction {
protected CalculatorFunctionOperation set; protected CalculatorFunctionOperation set;
protected CalculatorFunctionOperation add; protected CalculatorFunctionOperation add;
protected CalculatorFunctionOperation subtract; protected CalculatorFunctionOperation subtract;
protected CalculatorFunctionOperation random; protected CalculatorFunctionOperation random;
/** /**
* Gets the value of the set property. * Gets the value of the set property.
* *
* @return * @return
* possible object is * possible object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public CalculatorFunctionOperation getSet() { public CalculatorFunctionOperation getSet() {
return set; return set;
} }
/** /**
* Sets the value of the set property. * Sets the value of the set property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public void setSet(CalculatorFunctionOperation value) { public void setSet(CalculatorFunctionOperation value) {
this.set = value; this.set = value;
} }
/** /**
* Gets the value of the add property. * Gets the value of the add property.
* *
* @return * @return
* possible object is * possible object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public CalculatorFunctionOperation getAdd() { public CalculatorFunctionOperation getAdd() {
return add; return add;
} }
/** /**
* Sets the value of the add property. * Sets the value of the add property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public void setAdd(CalculatorFunctionOperation value) { public void setAdd(CalculatorFunctionOperation value) {
this.add = value; this.add = value;
} }
/** /**
* Gets the value of the subtract property. * Gets the value of the subtract property.
* *
* @return * @return
* possible object is * possible object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public CalculatorFunctionOperation getSubtract() { public CalculatorFunctionOperation getSubtract() {
return subtract; return subtract;
} }
/** /**
* Sets the value of the subtract property. * Sets the value of the subtract property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public void setSubtract(CalculatorFunctionOperation value) { public void setSubtract(CalculatorFunctionOperation value) {
this.subtract = value; this.subtract = value;
} }
/** /**
* Gets the value of the random property. * Gets the value of the random property.
* *
* @return * @return
* possible object is * possible object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public CalculatorFunctionOperation getRandom() { public CalculatorFunctionOperation getRandom() {
return random; return random;
} }
/** /**
* Sets the value of the random property. * Sets the value of the random property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link CalculatorFunctionOperation } * {@link CalculatorFunctionOperation }
* *
*/ */
public void setRandom(CalculatorFunctionOperation value) { public void setRandom(CalculatorFunctionOperation value) {
this.random = value; this.random = value;
} }
} }

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

@@ -1,86 +1,85 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.math.BigInteger; import java.math.BigInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType;
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>
* <pre> * &lt;complexType name="CalculatorFunctionOperation">
* &lt;complexType name="CalculatorFunctionOperation"> * &lt;complexContent>
* &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
* &lt;attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" /> * &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" />
* &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}double" /> * &lt;/restriction>
* &lt;/restriction> * &lt;/complexContent>
* &lt;/complexContent> * &lt;/complexType>
* &lt;/complexType> * </pre>
* </pre> *
* *
* */
*/ @XmlAccessorType(XmlAccessType.FIELD)
@XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "CalculatorFunctionOperation")
@XmlType(name = "CalculatorFunctionOperation") public class CalculatorFunctionOperation {
public class CalculatorFunctionOperation {
@XmlAttribute(name = "order", required = true)
@XmlAttribute(name = "order", required = true) protected BigInteger order;
protected BigInteger order; @XmlAttribute(name = "value", required = true)
@XmlAttribute(name = "value", required = true) protected double value;
protected double value;
/**
/** * Gets the value of the order property.
* Gets the value of the order property. *
* * @return
* @return * possible object is
* possible object is * {@link BigInteger }
* {@link BigInteger } *
* */
*/ public BigInteger getOrder() {
public BigInteger getOrder() { return order;
return order; }
}
/**
/** * Sets the value of the order property.
* Sets the value of the order property. *
* * @param value
* @param value * allowed object is
* allowed object is * {@link BigInteger }
* {@link BigInteger } *
* */
*/ public void setOrder(BigInteger value) {
public void setOrder(BigInteger value) { this.order = value;
this.order = value; }
}
/**
/** * Gets the value of the value property.
* Gets the value of the value property. *
* */
*/ public double getValue() {
public double getValue() { return value;
return value; }
}
/**
/** * Sets the value of the value property.
* Sets the value of the value property. *
* */
*/ public void setValue(double value) {
public void setValue(double value) { this.value = value;
this.value = value; }
}
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -1,97 +1,97 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType; 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> * <pre>
* &lt;complexType name="Coordinate"> * &lt;complexType name="Coordinate">
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;/sequence> * &lt;/sequence>
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="z" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Coordinate") @XmlType(name = "Coordinate")
public class Coordinate { public class Coordinate {
@XmlAttribute(name = "x", required = true) @XmlAttribute(name = "x", required = true)
protected int x; protected int x;
@XmlAttribute(name = "y", required = true) @XmlAttribute(name = "y", required = true)
protected int y; protected int y;
@XmlAttribute(name = "z", required = true) @XmlAttribute(name = "z", required = true)
protected int z; protected int z;
/** /**
* Gets the value of the x property. * Gets the value of the x property.
* *
*/ */
public int getX() { public int getX() {
return x; return x;
} }
/** /**
* Sets the value of the x property. * Sets the value of the x property.
* *
*/ */
public void setX(int value) { public void setX(int value) {
this.x = value; this.x = value;
} }
/** /**
* Gets the value of the y property. * Gets the value of the y property.
* *
*/ */
public int getY() { public int getY() {
return y; return y;
} }
/** /**
* Sets the value of the y property. * Sets the value of the y property.
* *
*/ */
public void setY(int value) { public void setY(int value) {
this.y = value; this.y = value;
} }
/** /**
* Gets the value of the z property. * Gets the value of the z property.
* *
*/ */
public int getZ() { public int getZ() {
return z; return z;
} }
/** /**
* Sets the value of the z property. * Sets the value of the z property.
* *
*/ */
public void setZ(int value) { public void setZ(int value) {
this.z = value; this.z = value;
} }
} }

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

File diff suppressed because it is too large Load Diff

6642
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

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

File diff suppressed because it is too large Load Diff

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

@@ -1,163 +1,162 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.l2jserver.model.id.template.SkillTemplateID;
import com.l2jserver.model.id.template.SkillTemplateID; import com.l2jserver.util.jaxb.SkillTemplateIDAdapter;
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>
* <pre> * &lt;element name="skill">
* &lt;element name="skill"> * &lt;complexType>
* &lt;complexType> * &lt;complexContent>
* &lt;complexContent> * &lt;extension base="{}AbstractTemplate">
* &lt;extension base="{}AbstractTemplate"> * &lt;sequence>
* &lt;sequence> * &lt;element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/>
* &lt;element name="maximumLevel" type="{http://www.w3.org/2001/XMLSchema}int"/> * &lt;/sequence>
* &lt;/sequence> * &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" />
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/skill}SkillTemplateID" /> * &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="delay" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="cooldown" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/extension>
* &lt;/extension> * &lt;/complexContent>
* &lt;/complexContent> * &lt;/complexType>
* &lt;/complexType> * &lt;/element>
* &lt;/element> * </pre>
* </pre> *
* *
* */
*/ @XmlAccessorType(XmlAccessType.FIELD)
@XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {
@XmlType(name = "", propOrder = { "maximumLevel"
"maximumLevel" })
}) @XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill")
@XmlRootElement(name = "skill", namespace = "http://schemas.l2jserver2.com/skill") public class SkillTemplate
public class SkillTemplate extends AbstractTemplate
extends AbstractTemplate {
{
protected int maximumLevel;
protected int maximumLevel; @XmlAttribute(name = "id", required = true)
@XmlAttribute(name = "id", required = true) @XmlJavaTypeAdapter(SkillTemplateIDAdapter.class)
@XmlJavaTypeAdapter(SkillTemplateIDAdapter.class) protected SkillTemplateID id;
protected SkillTemplateID id; @XmlAttribute(name = "name", required = true)
@XmlAttribute(name = "name", required = true) protected String name;
protected String name; @XmlAttribute(name = "delay", required = true)
@XmlAttribute(name = "delay", required = true) protected int delay;
protected int delay; @XmlAttribute(name = "cooldown", required = true)
@XmlAttribute(name = "cooldown", required = true) protected int cooldown;
protected int cooldown;
/**
/** * Gets the value of the maximumLevel property.
* Gets the value of the maximumLevel property. *
* */
*/ public int getMaximumLevel() {
public int getMaximumLevel() { return maximumLevel;
return maximumLevel; }
}
/**
/** * Sets the value of the maximumLevel property.
* Sets the value of the maximumLevel property. *
* */
*/ public void setMaximumLevel(int value) {
public void setMaximumLevel(int value) { this.maximumLevel = value;
this.maximumLevel = value; }
}
/**
/** * Gets the value of the id property.
* Gets the value of the id property. *
* * @return
* @return * possible object is
* possible object is * {@link String }
* {@link String } *
* */
*/ public SkillTemplateID getID() {
public SkillTemplateID getID() { return id;
return id; }
}
/**
/** * Sets the value of the id property.
* Sets the value of the id property. *
* * @param value
* @param value * allowed object is
* allowed object is * {@link String }
* {@link String } *
* */
*/ public void setID(SkillTemplateID value) {
public void setID(SkillTemplateID value) { this.id = value;
this.id = value; }
}
/**
/** * Gets the value of the name property.
* Gets the value of the name property. *
* * @return
* @return * possible object is
* possible object is * {@link String }
* {@link String } *
* */
*/ public String getName() {
public String getName() { return name;
return name; }
}
/**
/** * Sets the value of the name property.
* Sets the value of the name property. *
* * @param value
* @param value * allowed object is
* allowed object is * {@link String }
* {@link String } *
* */
*/ public void setName(String value) {
public void setName(String value) { this.name = value;
this.name = value; }
}
/**
/** * Gets the value of the delay property.
* Gets the value of the delay property. *
* */
*/ public int getDelay() {
public int getDelay() { return delay;
return delay; }
}
/**
/** * Sets the value of the delay property.
* Sets the value of the delay property. *
* */
*/ public void setDelay(int value) {
public void setDelay(int value) { this.delay = value;
this.delay = value; }
}
/**
/** * Gets the value of the cooldown property.
* Gets the value of the cooldown property. *
* */
*/ public int getCooldown() {
public int getCooldown() { return cooldown;
return cooldown; }
}
/**
/** * Sets the value of the cooldown property.
* Sets the value of the cooldown property. *
* */
*/ public void setCooldown(int value) {
public void setCooldown(int value) { this.cooldown = value;
this.cooldown = value; }
}
}
}

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

@@ -1,381 +1,379 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.l2jserver.model.id.template.TeleportationTemplateID;
import com.l2jserver.util.jaxb.TeleportationTemplateIDAdapter;
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>
* <pre> * &lt;complexContent>
* &lt;complexType> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;complexContent> * &lt;sequence>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;element name="teleport" maxOccurs="unbounded">
* &lt;sequence> * &lt;complexType>
* &lt;element name="teleport" maxOccurs="unbounded"> * &lt;complexContent>
* &lt;complexType> * &lt;extension base="{}AbstractTemplate">
* &lt;complexContent> * &lt;sequence>
* &lt;extension base="{}AbstractTemplate"> * &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;sequence> * &lt;element name="restrictions" minOccurs="0">
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/> * &lt;complexType>
* &lt;element name="restrictions" minOccurs="0"> * &lt;complexContent>
* &lt;complexType> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;complexContent> * &lt;sequence>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;element name="restriction" maxOccurs="unbounded">
* &lt;sequence> * &lt;simpleType>
* &lt;element name="restriction" maxOccurs="unbounded"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;simpleType> * &lt;enumeration value="NOBLE"/>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"> * &lt;/restriction>
* &lt;enumeration value="NOBLE"/> * &lt;/simpleType>
* &lt;/restriction> * &lt;/element>
* &lt;/simpleType> * &lt;/sequence>
* &lt;/element> * &lt;/restriction>
* &lt;/sequence> * &lt;/complexContent>
* &lt;/restriction> * &lt;/complexType>
* &lt;/complexContent> * &lt;/element>
* &lt;/complexType> * &lt;/sequence>
* &lt;/element> * &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;/sequence> * &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" /> * &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/extension>
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/complexContent>
* &lt;/extension> * &lt;/complexType>
* &lt;/complexContent> * &lt;/element>
* &lt;/complexType> * &lt;/sequence>
* &lt;/element> * &lt;/restriction>
* &lt;/sequence> * &lt;/complexContent>
* &lt;/restriction> * &lt;/complexType>
* &lt;/complexContent> * </pre>
* &lt;/complexType> *
* </pre> *
* */
* @XmlAccessorType(XmlAccessType.FIELD)
*/ @XmlType(name = "", propOrder = {
@XmlAccessorType(XmlAccessType.FIELD) "teleport"
@XmlType(name = "", propOrder = { })
"teleport" @XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
}) public class Teleports {
@XmlRootElement(name = "teleports", namespace = "http://schemas.l2jserver2.com/teleport")
public class Teleports { @XmlElement(required = true)
protected List<Teleports.Teleport> teleport;
@XmlElement(required = true)
protected List<Teleports.Teleport> teleport; /**
* Gets the value of the teleport property.
/** *
* Gets the value of the teleport property. * <p>
* * This accessor method returns a reference to the live list,
* <p> * not a snapshot. Therefore any modification you make to the
* This accessor method returns a reference to the live list, * returned list will be present inside the JAXB object.
* not a snapshot. Therefore any modification you make to the * This is why there is not a <CODE>set</CODE> method for the teleport property.
* 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:
* <p> * <pre>
* For example, to add a new item, do as follows: * getTeleport().add(newItem);
* <pre> * </pre>
* getTeleport().add(newItem); *
* </pre> *
* * <p>
* * Objects of the following type(s) are allowed in the list
* <p> * {@link Teleports.Teleport }
* Objects of the following type(s) are allowed in the list *
* {@link Teleports.Teleport } *
* */
* public List<Teleports.Teleport> getTeleport() {
*/ if (teleport == null) {
public List<Teleports.Teleport> getTeleport() { teleport = new ArrayList<Teleports.Teleport>();
if (teleport == null) { }
teleport = new ArrayList<Teleports.Teleport>(); return this.teleport;
} }
return this.teleport;
}
/**
* <p>Java class for anonymous complex type.
/** *
* <p>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>
* <pre> * &lt;complexContent>
* &lt;complexType> * &lt;extension base="{}AbstractTemplate">
* &lt;complexContent> * &lt;sequence>
* &lt;extension base="{}AbstractTemplate"> * &lt;element name="point" type="{}Coordinate" minOccurs="0"/>
* &lt;sequence> * &lt;element name="restrictions" minOccurs="0">
* &lt;element name="point" type="{}Coordinate" minOccurs="0"/> * &lt;complexType>
* &lt;element name="restrictions" minOccurs="0"> * &lt;complexContent>
* &lt;complexType> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;complexContent> * &lt;sequence>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;element name="restriction" maxOccurs="unbounded">
* &lt;sequence> * &lt;simpleType>
* &lt;element name="restriction" maxOccurs="unbounded"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;simpleType> * &lt;enumeration value="NOBLE"/>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"> * &lt;/restriction>
* &lt;enumeration value="NOBLE"/> * &lt;/simpleType>
* &lt;/restriction> * &lt;/element>
* &lt;/simpleType> * &lt;/sequence>
* &lt;/element> * &lt;/restriction>
* &lt;/sequence> * &lt;/complexContent>
* &lt;/restriction> * &lt;/complexType>
* &lt;/complexContent> * &lt;/element>
* &lt;/complexType> * &lt;/sequence>
* &lt;/element> * &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" />
* &lt;/sequence> * &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="id" use="required" type="{http://schemas.l2jserver2.com/teleport}TeleportationTemplateID" /> * &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="item" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/extension>
* &lt;attribute name="price" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/complexContent>
* &lt;/extension> * &lt;/complexType>
* &lt;/complexContent> * </pre>
* &lt;/complexType> *
* </pre> *
* */
* @XmlAccessorType(XmlAccessType.FIELD)
*/ @XmlType(name = "", propOrder = {
@XmlAccessorType(XmlAccessType.FIELD) "point",
@XmlType(name = "", propOrder = { "restrictions"
"point", })
"restrictions" public static class Teleport
}) extends AbstractTemplate
public static class Teleport {
extends AbstractTemplate
{ protected Coordinate point;
protected Teleports.Teleport.Restrictions restrictions;
protected Coordinate point; @XmlAttribute(name = "id", required = true)
protected Teleports.Teleport.Restrictions restrictions; @XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class)
@XmlAttribute(name = "id", required = true) protected TeleportationTemplateID id;
@XmlJavaTypeAdapter(TeleportationTemplateIDAdapter.class) @XmlAttribute(name = "name")
protected TeleportationTemplateID id; protected String name;
@XmlAttribute(name = "name") @XmlAttribute(name = "item")
protected String name; protected Integer item;
@XmlAttribute(name = "item") @XmlAttribute(name = "price", required = true)
protected Integer item; protected int price;
@XmlAttribute(name = "price", required = true)
protected int price; /**
* Gets the value of the point property.
/** *
* Gets the value of the point property. * @return
* * possible object is
* @return * {@link Coordinate }
* possible object is *
* {@link Coordinate } */
* public Coordinate getPoint() {
*/ return point;
public Coordinate getPoint() { }
return point;
} /**
* Sets the value of the point property.
/** *
* Sets the value of the point property. * @param value
* * allowed object is
* @param value * {@link Coordinate }
* allowed object is *
* {@link Coordinate } */
* public void setPoint(Coordinate value) {
*/ this.point = value;
public void setPoint(Coordinate value) { }
this.point = value;
} /**
* Gets the value of the restrictions property.
/** *
* Gets the value of the restrictions property. * @return
* * possible object is
* @return * {@link Teleports.Teleport.Restrictions }
* possible object is *
* {@link Teleports.Teleport.Restrictions } */
* public Teleports.Teleport.Restrictions getRestrictions() {
*/ return restrictions;
public Teleports.Teleport.Restrictions getRestrictions() { }
return restrictions;
} /**
* Sets the value of the restrictions property.
/** *
* Sets the value of the restrictions property. * @param value
* * allowed object is
* @param value * {@link Teleports.Teleport.Restrictions }
* allowed object is *
* {@link Teleports.Teleport.Restrictions } */
* public void setRestrictions(Teleports.Teleport.Restrictions value) {
*/ this.restrictions = value;
public void setRestrictions(Teleports.Teleport.Restrictions value) { }
this.restrictions = value;
} /**
* Gets the value of the id property.
/** *
* Gets the value of the id property. * @return
* * possible object is
* @return * {@link String }
* possible object is *
* {@link String } */
* public TeleportationTemplateID getID() {
*/ return id;
public TeleportationTemplateID getID() { }
return id;
} /**
* Sets the value of the id property.
/** *
* Sets the value of the id property. * @param value
* * allowed object is
* @param value * {@link String }
* allowed object is *
* {@link String } */
* public void setID(TeleportationTemplateID value) {
*/ this.id = value;
public void setID(TeleportationTemplateID value) { }
this.id = value;
} /**
* Gets the value of the name property.
/** *
* Gets the value of the name property. * @return
* * possible object is
* @return * {@link String }
* possible object is *
* {@link String } */
* public String getName() {
*/ return name;
public String getName() { }
return name;
} /**
* Sets the value of the name property.
/** *
* Sets the value of the name property. * @param value
* * allowed object is
* @param value * {@link String }
* allowed object is *
* {@link String } */
* public void setName(String value) {
*/ this.name = value;
public void setName(String value) { }
this.name = value;
} /**
* Gets the value of the item property.
/** *
* Gets the value of the item property. * @return
* * possible object is
* @return * {@link Integer }
* possible object is *
* {@link Integer } */
* public Integer getItem() {
*/ return item;
public Integer getItem() { }
return item;
} /**
* Sets the value of the item property.
/** *
* Sets the value of the item property. * @param value
* * allowed object is
* @param value * {@link Integer }
* allowed object is *
* {@link Integer } */
* public void setItem(Integer value) {
*/ this.item = value;
public void setItem(Integer value) { }
this.item = value;
} /**
* Gets the value of the price property.
/** *
* Gets the value of the price property. */
* public int getPrice() {
*/ return price;
public int getPrice() { }
return price;
} /**
* Sets the value of the price property.
/** *
* Sets the value of the price property. */
* public void setPrice(int value) {
*/ this.price = value;
public void setPrice(int value) { }
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>
* <pre> * &lt;complexContent>
* &lt;complexType> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;complexContent> * &lt;sequence>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;element name="restriction" maxOccurs="unbounded">
* &lt;sequence> * &lt;simpleType>
* &lt;element name="restriction" maxOccurs="unbounded"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;simpleType> * &lt;enumeration value="NOBLE"/>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"> * &lt;/restriction>
* &lt;enumeration value="NOBLE"/> * &lt;/simpleType>
* &lt;/restriction> * &lt;/element>
* &lt;/simpleType> * &lt;/sequence>
* &lt;/element> * &lt;/restriction>
* &lt;/sequence> * &lt;/complexContent>
* &lt;/restriction> * &lt;/complexType>
* &lt;/complexContent> * </pre>
* &lt;/complexType> *
* </pre> *
* */
* @XmlAccessorType(XmlAccessType.FIELD)
*/ @XmlType(name = "", propOrder = {
@XmlAccessorType(XmlAccessType.FIELD) "restriction"
@XmlType(name = "", propOrder = { })
"restriction" public static class Restrictions {
})
public static class Restrictions { @XmlElement(required = true)
protected List<String> restriction;
@XmlElement(required = true)
protected List<String> restriction; /**
* Gets the value of the restriction property.
/** *
* Gets the value of the restriction property. * <p>
* * This accessor method returns a reference to the live list,
* <p> * not a snapshot. Therefore any modification you make to the
* This accessor method returns a reference to the live list, * returned list will be present inside the JAXB object.
* not a snapshot. Therefore any modification you make to the * This is why there is not a <CODE>set</CODE> method for the restriction property.
* 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:
* <p> * <pre>
* For example, to add a new item, do as follows: * getRestriction().add(newItem);
* <pre> * </pre>
* getRestriction().add(newItem); *
* </pre> *
* * <p>
* * Objects of the following type(s) are allowed in the list
* <p> * {@link String }
* Objects of the following type(s) are allowed in the list *
* {@link String } *
* */
* public List<String> getRestriction() {
*/ if (restriction == null) {
public List<String> getRestriction() { restriction = new ArrayList<String>();
if (restriction == null) { }
restriction = new ArrayList<String>(); return this.restriction;
} }
return this.restriction;
} }
} }
} }
}

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

@@ -1,180 +1,179 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType;
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>
* <pre> * &lt;complexType name="ZoneType">
* &lt;complexType name="ZoneType"> * &lt;complexContent>
* &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence>
* &lt;sequence> * &lt;element name="point" maxOccurs="unbounded">
* &lt;element name="point" maxOccurs="unbounded"> * &lt;complexType>
* &lt;complexType> * &lt;complexContent>
* &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence>
* &lt;sequence> * &lt;/sequence>
* &lt;/sequence> * &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/restriction>
* &lt;/restriction> * &lt;/complexContent>
* &lt;/complexContent> * &lt;/complexType>
* &lt;/complexType> * &lt;/element>
* &lt;/element> * &lt;/sequence>
* &lt;/sequence> * &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
* &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;/restriction>
* &lt;/restriction> * &lt;/complexContent>
* &lt;/complexContent> * &lt;/complexType>
* &lt;/complexType> * </pre>
* </pre> *
* *
* */
*/ @XmlAccessorType(XmlAccessType.FIELD)
@XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "ZoneType", namespace = "zones", propOrder = {
@XmlType(name = "ZoneType", namespace = "zones", propOrder = { "point"
"point" })
}) public class ZoneType {
public class ZoneType {
@XmlElement(required = true)
@XmlElement(required = true) protected List<ZoneType.Point> point;
protected List<ZoneType.Point> point; @XmlAttribute(name = "id", required = true)
@XmlAttribute(name = "id", required = true) protected String id;
protected String id;
/**
/** * Gets the value of the point property.
* Gets the value of the point property. *
* * <p>
* <p> * This accessor method returns a reference to the live list,
* This accessor method returns a reference to the live list, * not a snapshot. Therefore any modification you make to the
* not a snapshot. Therefore any modification you make to the * returned list will be present inside the JAXB object.
* 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 is why there is not a <CODE>set</CODE> method for the point property. *
* * <p>
* <p> * For example, to add a new item, do as follows:
* For example, to add a new item, do as follows: * <pre>
* <pre> * getPoint().add(newItem);
* getPoint().add(newItem); * </pre>
* </pre> *
* *
* * <p>
* <p> * Objects of the following type(s) are allowed in the list
* Objects of the following type(s) are allowed in the list * {@link ZoneType.Point }
* {@link ZoneType.Point } *
* *
* */
*/ public List<ZoneType.Point> getPoint() {
public List<ZoneType.Point> getPoint() { if (point == null) {
if (point == null) { point = new ArrayList<ZoneType.Point>();
point = new ArrayList<ZoneType.Point>(); }
} return this.point;
return this.point; }
}
/**
/** * Gets the value of the id property.
* Gets the value of the id property. *
* * @return
* @return * possible object is
* possible object is * {@link String }
* {@link String } *
* */
*/ public String getId() {
public String getId() { return id;
return id; }
}
/**
/** * Sets the value of the id property.
* Sets the value of the id property. *
* * @param value
* @param value * allowed object is
* allowed object is * {@link String }
* {@link String } *
* */
*/ public void setId(String value) {
public void setId(String value) { this.id = value;
this.id = value; }
}
/**
/** * <p>Java class for anonymous complex type.
* <p>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>
* <pre> * &lt;complexType>
* &lt;complexType> * &lt;complexContent>
* &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence>
* &lt;sequence> * &lt;/sequence>
* &lt;/sequence> * &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="x" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
* &lt;attribute name="y" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> * &lt;/restriction>
* &lt;/restriction> * &lt;/complexContent>
* &lt;/complexContent> * &lt;/complexType>
* &lt;/complexType> * </pre>
* </pre> *
* *
* */
*/ @XmlAccessorType(XmlAccessType.FIELD)
@XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "")
@XmlType(name = "") public static class Point {
public static class Point {
@XmlAttribute(name = "x", required = true)
@XmlAttribute(name = "x", required = true) protected int x;
protected int x; @XmlAttribute(name = "y", required = true)
@XmlAttribute(name = "y", required = true) protected int y;
protected int y;
/**
/** * Gets the value of the x property.
* Gets the value of the x property. *
* */
*/ public int getX() {
public int getX() { return x;
return x; }
}
/**
/** * Sets the value of the x property.
* Sets the value of the x property. *
* */
*/ public void setX(int value) {
public void setX(int value) { this.x = value;
this.x = value; }
}
/**
/** * Gets the value of the y property.
* Gets the value of the y property. *
* */
*/ public int getY() {
public int getY() { return y;
return y; }
}
/**
/** * Sets the value of the y property.
* Sets the value of the y property. *
* */
*/ public void setY(int value) {
public void setY(int value) { this.y = value;
this.y = value; }
}
}
}
}
}

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

@@ -1,211 +1,211 @@
// //
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.5-b10
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema. // Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2012.01.19 at 03:37:11 PM BRST // Generated on: 2012.03.25 at 10:36:48 AM BRT
// //
package com.l2jserver.model.template; package com.l2jserver.model.template;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; 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> * <pre>
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="castle"> * &lt;element name="castle">
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="siege"> * &lt;element name="siege">
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/> * &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* &lt;/element> * &lt;/element>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* &lt;/element> * &lt;/element>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { @XmlType(name = "", propOrder = {
"castle" "castle"
}) })
@XmlRootElement(name = "zones", namespace = "zones") @XmlRootElement(name = "zones", namespace = "zones")
public class Zones { public class Zones {
@XmlElement(required = true) @XmlElement(required = true)
protected Zones.Castle castle; protected Zones.Castle castle;
/** /**
* Gets the value of the castle property. * Gets the value of the castle property.
* *
* @return * @return
* possible object is * possible object is
* {@link Zones.Castle } * {@link Zones.Castle }
* *
*/ */
public Zones.Castle getCastle() { public Zones.Castle getCastle() {
return castle; return castle;
} }
/** /**
* Sets the value of the castle property. * Sets the value of the castle property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link Zones.Castle } * {@link Zones.Castle }
* *
*/ */
public void setCastle(Zones.Castle value) { public void setCastle(Zones.Castle value) {
this.castle = value; this.castle = value;
} }
/** /**
* <p>Java class for anonymous complex type. * <p>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> * <pre>
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="siege"> * &lt;element name="siege">
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/> * &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* &lt;/element> * &lt;/element>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { @XmlType(name = "", propOrder = {
"siege" "siege"
}) })
public static class Castle { public static class Castle {
@XmlElement(required = true) @XmlElement(required = true)
protected Zones.Castle.Siege siege; protected Zones.Castle.Siege siege;
/** /**
* Gets the value of the siege property. * Gets the value of the siege property.
* *
* @return * @return
* possible object is * possible object is
* {@link Zones.Castle.Siege } * {@link Zones.Castle.Siege }
* *
*/ */
public Zones.Castle.Siege getSiege() { public Zones.Castle.Siege getSiege() {
return siege; return siege;
} }
/** /**
* Sets the value of the siege property. * Sets the value of the siege property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link Zones.Castle.Siege } * {@link Zones.Castle.Siege }
* *
*/ */
public void setSiege(Zones.Castle.Siege value) { public void setSiege(Zones.Castle.Siege value) {
this.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> * <pre>
* &lt;complexType> * &lt;complexType>
* &lt;complexContent> * &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence> * &lt;sequence>
* &lt;element name="zone" type="{zones}ZoneType"/> * &lt;element name="zone" type="{zones}ZoneType"/>
* &lt;/sequence> * &lt;/sequence>
* &lt;/restriction> * &lt;/restriction>
* &lt;/complexContent> * &lt;/complexContent>
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* *
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = { @XmlType(name = "", propOrder = {
"zone" "zone"
}) })
public static class Siege { public static class Siege {
@XmlElement(required = true) @XmlElement(required = true)
protected ZoneType zone; protected ZoneType zone;
/** /**
* Gets the value of the zone property. * Gets the value of the zone property.
* *
* @return * @return
* possible object is * possible object is
* {@link ZoneType } * {@link ZoneType }
* *
*/ */
public ZoneType getZone() { public ZoneType getZone() {
return zone; return zone;
} }
/** /**
* Sets the value of the zone property. * Sets the value of the zone property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link ZoneType } * {@link ZoneType }
* *
*/ */
public void setZone(ZoneType value) { public void setZone(ZoneType value) {
this.zone = value; this.zone = value;
} }
} }
} }
} }

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

@@ -149,7 +149,7 @@ public class FreyaLineage2Client implements Lineage2Client {
* @param version * @param version
* the protocol version to test for support * the protocol version to test for support
* @return true if version is supported by the client * @return true if version is supported by the client
* @see com.l2jserver.service.network.model.net.ProtocolVersion#supports(com.l2jserver.service.network.model.net.ProtocolVersion) * @see ProtocolVersion#supports(ProtocolVersion)
*/ */
public boolean supports(ProtocolVersion version) { public boolean supports(ProtocolVersion version) {
if (version == null) if (version == null)