Fixes issue loading teleportation templates

Rogiel · May 3, 2012 · 74c894a · 74c894a
1 parent c548c92
commit 74c894a
Show file tree

Hide file tree

Showing 23 changed files with 7,245 additions and 7,099 deletions.
diff --git a/l2jserver2-gameserver/data/template/l2jserver2.xsd b/l2jserver2-gameserver/data/template/l2jserver2.xsd
@@ -9,7 +9,8 @@
 		<xs:annotation>
 			<xs:appinfo>
 				<xjc:superClass name="com.l2jserver.model.template.Template" />
-				<inheritance:implements>com.l2jserver.model.template.Template</inheritance:implements>
+				<inheritance:implements>com.l2jserver.model.template.Template
+				</inheritance:implements>
 			</xs:appinfo>
 		</xs:annotation>
 		<xs:sequence />
@@ -27,11 +28,11 @@
 	</xs:simpleType>
 
 	<xs:complexType name="Coordinate">
-		<!-- <xs:annotation> -->
-		<!-- <xs:appinfo> -->
-		<!-- <jaxb:javaType name="com.l2jserver.util.geometry.Coordinate" /> -->
-		<!-- </xs:appinfo> -->
-		<!-- </xs:annotation> -->
+		<xs:annotation>
+			<xs:appinfo>
+				<jaxb:class name="TemplateCoordinate" />
+			</xs:appinfo>
+		</xs:annotation>
 		<xs:sequence />
 		<xs:attribute name="x" type="xs:int" use="required" />
 		<xs:attribute name="y" type="xs:int" use="required" />

diff --git a/l2jserver2-gameserver/data/template/teleport.xsd b/l2jserver2-gameserver/data/template/teleport.xsd
@@ -18,45 +18,50 @@
 		<xs:restriction base="TemplateID" />
 	</xs:simpleType>
 
+	<xs:complexType name="TeleportationTemplate">
+		<xs:annotation>
+			<xs:appinfo>
+				<jaxb:class name="TeleportationTemplate" />
+			</xs:appinfo>
+		</xs:annotation>
+		<xs:complexContent>
+			<xs:extension base="AbstractTemplate">
+				<xs:sequence>
+					<xs:element name="point" type="Coordinate" minOccurs="0" />
+					<xs:element name="restrictions" minOccurs="0">
+						<xs:complexType>
+							<xs:sequence>
+								<xs:element name="restriction" maxOccurs="unbounded">
+									<xs:simpleType>
+										<xs:restriction base="xs:string">
+											<xs:enumeration value="NOBLE" />
+										</xs:restriction>
+									</xs:simpleType>
+								</xs:element>
+							</xs:sequence>
+						</xs:complexType>
+					</xs:element>
+				</xs:sequence>
+				<xs:attribute name="id" type="ths:TeleportationTemplateID"
+					use="required">
+					<xs:annotation>
+						<xs:appinfo>
+							<jaxb:property name="iD" />
+						</xs:appinfo>
+					</xs:annotation>
+				</xs:attribute>
+				<xs:attribute name="name" type="xs:string" />
+				<xs:attribute name="item" type="xs:int" />
+				<xs:attribute name="price" type="xs:int" use="required" />
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
 	<xs:element name="teleports">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="teleport" minOccurs="1" maxOccurs="unbounded">
-					<xs:complexType>
-						<xs:complexContent>
-							<xs:extension base="AbstractTemplate">
-								<xs:sequence>
-									<xs:element name="point" type="Coordinate"
-										minOccurs="0" />
-									<xs:element name="restrictions" minOccurs="0">
-										<xs:complexType>
-											<xs:sequence>
-												<xs:element name="restriction" maxOccurs="unbounded">
-													<xs:simpleType>
-														<xs:restriction base="xs:string">
-															<xs:enumeration value="NOBLE" />
-														</xs:restriction>
-													</xs:simpleType>
-												</xs:element>
-											</xs:sequence>
-										</xs:complexType>
-									</xs:element>
-								</xs:sequence>
-								<xs:attribute name="id" type="ths:TeleportationTemplateID"
-									use="required">
-									<xs:annotation>
-										<xs:appinfo>
-											<jaxb:property name="iD"  />
-										</xs:appinfo>
-									</xs:annotation>
-								</xs:attribute>
-								<xs:attribute name="name" type="xs:string" />
-								<xs:attribute name="item" type="xs:int" />
-								<xs:attribute name="price" type="xs:int" use="required" />
-							</xs:extension>
-						</xs:complexContent>
-					</xs:complexType>
-				</xs:element>
+				<xs:element name="teleport" type="ths:TeleportationTemplate"
+					minOccurs="1" maxOccurs="unbounded" />
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>

diff --git a/...erver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode b/...erver2-gameserver/l2jserver2-gameserver-core/src/main/generated/META-INF/sun-jaxb.episode
@@ -5,15 +5,27 @@
 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> 
 Any modifications to this file will be lost upon recompilation of the source schema. 
-Generated on: 2012.03.25 at 01:03:28 PM BRT 
+Generated on: 2012.05.03 at 07:58:30 PM BRT 
 
   -->
-  <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/item">
+  <jaxb:bindings scd="x-schema::">
     <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 scd="~CalculatorFunction">
+      <jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~AbstractTemplate">
+      <jaxb:class ref="com.l2jserver.model.template.AbstractTemplate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~Coordinate">
+      <jaxb:class ref="com.l2jserver.model.template.TemplateCoordinate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~ActorTemplate">
+      <jaxb:class ref="com.l2jserver.model.template.ActorTemplate"/>
+    </jaxb:bindings>
+    <jaxb:bindings scd="~CalculatorFunctionOperation">
+      <jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
     </jaxb:bindings>
   </jaxb:bindings>
   <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/npc">
@@ -24,40 +36,31 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
       <jaxb:class ref="com.l2jserver.model.template.NPCTemplate"/>
     </jaxb:bindings>
   </jaxb:bindings>
-  <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/teleport">
+  <jaxb:bindings scd="x-schema::tns" xmlns:tns="http://schemas.l2jserver2.com/character">
     <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 scd="tns:character">
+      <jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
     </jaxb:bindings>
   </jaxb:bindings>
-  <jaxb:bindings scd="x-schema::">
+  <jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
     <jaxb:schemaBindings map="false">
       <jaxb:package name="com.l2jserver.model.template"/>
     </jaxb:schemaBindings>
-    <jaxb:bindings scd="~CalculatorFunction">
-      <jaxb:class ref="com.l2jserver.model.template.CalculatorFunction"/>
-    </jaxb:bindings>
-    <jaxb:bindings scd="~AbstractTemplate">
-      <jaxb:class ref="com.l2jserver.model.template.AbstractTemplate"/>
-    </jaxb:bindings>
-    <jaxb:bindings scd="~Coordinate">
-      <jaxb:class ref="com.l2jserver.model.template.Coordinate"/>
-    </jaxb:bindings>
-    <jaxb:bindings scd="~ActorTemplate">
-      <jaxb:class ref="com.l2jserver.model.template.ActorTemplate"/>
+    <jaxb:bindings scd="tns:zones">
+      <jaxb:class ref="com.l2jserver.model.template.Zones"/>
     </jaxb:bindings>
-    <jaxb:bindings scd="~CalculatorFunctionOperation">
-      <jaxb:class ref="com.l2jserver.model.template.CalculatorFunctionOperation"/>
+    <jaxb:bindings scd="~tns:ZoneType">
+      <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
     </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/item">
     <jaxb:schemaBindings map="false">
       <jaxb:package name="com.l2jserver.model.template"/>
     </jaxb:schemaBindings>
-    <jaxb:bindings scd="tns:character">
-      <jaxb:class ref="com.l2jserver.model.template.CharacterTemplate"/>
+    <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">
@@ -68,15 +71,15 @@ Generated on: 2012.03.25 at 01:03:28 PM BRT
       <jaxb:class ref="com.l2jserver.model.template.SkillTemplate"/>
     </jaxb:bindings>
   </jaxb:bindings>
-  <jaxb:bindings scd="x-schema::tns" xmlns:tns="zones">
+  <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:zones">
-      <jaxb:class ref="com.l2jserver.model.template.Zones"/>
+    <jaxb:bindings scd="~tns:TeleportationTemplate">
+      <jaxb:class ref="com.l2jserver.model.template.TeleportationTemplate"/>
     </jaxb:bindings>
-    <jaxb:bindings scd="~tns:ZoneType">
-      <jaxb:class ref="com.l2jserver.model.template.ZoneType"/>
+    <jaxb:bindings scd="tns:teleports">
+      <jaxb:class ref="com.l2jserver.model.template.Teleports"/>
     </jaxb:bindings>
   </jaxb:bindings>
 </jaxb:bindings>

diff --git a/...er2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java b/...er2-gameserver-core/src/main/generated/com/l2jserver/model/template/AbstractTemplate.java
@@ -2,23 +2,22 @@
 // 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> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.03.25 at 01:03:28 PM BRT 
+// Generated on: 2012.05.03 at 07:58:30 PM BRT 
 //
 
+
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
 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">
@@ -35,8 +34,15 @@
  */
 @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,
+    TeleportationTemplate.class
+})
+public abstract class AbstractTemplate
+    implements Template
+{
+
 
 }
diff --git a/...erver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java b/...erver2-gameserver-core/src/main/generated/com/l2jserver/model/template/ActorTemplate.java
@@ -2,23 +2,22 @@
 // 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> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2012.03.25 at 01:03:28 PM BRT 
+// Generated on: 2012.05.03 at 07:58:30 PM BRT 
 //
 
+
 package com.l2jserver.model.template;
 
 import javax.xml.bind.annotation.XmlAccessType;
 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">
@@ -33,7 +32,13 @@
  */
 @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
+{
+
 
 }