Update of /cvsroot/bprocessor/model/src/etc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11071/src/etc
Modified Files:
bprocessor.xsd
Log Message:
Added xml schema for constructors and added interlizing and externalizing of constructors to persistens.java, Added checkpoint call to ConstructorTool and added empty constructor to Line Point and Coordinatesystem
Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bprocessor.xsd 15 May 2006 10:29:56 -0000 1.12
--- bprocessor.xsd 31 Jul 2006 11:25:51 -0000 1.13
***************
*** 10,18 ****
<xsd:complexType name="EntityType">
<xsd:sequence>
! <xsd:element name="id" type="xsd:long"/>
! <xsd:element name="progid" type="xsd:long"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="SpaceType">
<xsd:complexContent>
--- 10,30 ----
<xsd:complexType name="EntityType">
<xsd:sequence>
! <xsd:element name="id" type="xsd:long" maxOccurs="1" minOccurs="1"/>
! <xsd:element name="progid" type="xsd:long" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="ConstructorType">
+ <xsd:complexContent>
+ <xsd:extension base="EntityType">
+ <xsd:sequence>
+ <xsd:element ref="origin" maxOccurs="1" minOccurs="1"/>
+ <xsd:element name="active" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="editable" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
<xsd:complexType name="SpaceType">
<xsd:complexContent>
***************
*** 29,33 ****
<xsd:element ref="edge" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
! <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
--- 41,46 ----
<xsd:element ref="edge" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
! <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/>
! <xsd:element ref="constructor" maxOccurs="unbounded" minOccurs="0"/>
</xsd:sequence>
</xsd:extension>
***************
*** 85,92 ****
--- 98,134 ----
<xsd:element name="B" type="xsd:float" maxOccurs="1" minOccurs="0"/>
</xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="LineType">
+ <xsd:complexContent>
+ <xsd:extension base="ConstructorType">
+ <xsd:sequence>
+ <xsd:element ref="direction" maxOccurs="1" minOccurs="1"/>
+ </xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
+ <xsd:complexType name="PointType">
+ <xsd:complexContent>
+ <xsd:extension base="ConstructorType">
+ <xsd:sequence>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="CoordinateSystemType">
+ <xsd:complexContent>
+ <xsd:extension base="ConstructorType">
+ <xsd:sequence>
+ <xsd:element name="onlyplane" type="xsd:boolean" maxOccurs="1" minOccurs="0"/>
+ <xsd:element ref="ijn" maxOccurs="3" minOccurs="3"/>
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
<!-- Element definitions -->
***************
*** 96,99 ****
--- 138,145 ----
<xsd:element name="vertex" type="VertexType"/>
<xsd:element name="material" type="MaterialType"/>
+ <xsd:element name="constructor" type="ConstructorType"/>
+ <xsd:element name="origin" type="VertexType"/>
+ <xsd:element name="direction" type="VertexType"/>
+ <xsd:element name="ijn" type="VertexType"/>
<!-- Main element -->
***************
*** 102,105 ****
--- 148,152 ----
<xsd:sequence>
<xsd:element name="active" type="xsd:long" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="cs" type="xsd:long" maxOccurs="1" minOccurs="0"/>
<xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/>
<xsd:element ref="surface" maxOccurs="unbounded" minOccurs="0"/>
|
