[Bprocessor-commit] model/src/etc bprocessor.xsd,1.17,1.18
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
[Bprocessor-commit] model/src/etc bprocessor.xsd,1.17,1.18
|
From: rimestad <rim...@us...> - 2006-10-09 08:49:30
|
Update of /cvsroot/bprocessor/model/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26457/src/etc Modified Files: bprocessor.xsd Log Message: made changes to the schema so that subtypes get a type attribute that tell which type it represents so that several types can be stored as the same tag, require update of build.xml and Persistence.java as well Index: bprocessor.xsd =================================================================== RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** bprocessor.xsd 26 Sep 2006 09:52:25 -0000 1.17 --- bprocessor.xsd 9 Oct 2006 08:49:21 -0000 1.18 *************** *** 5,16 **** $Id$ --> ! <xsd:schema xmlns:bpr="http://bprocessor.sourceforge.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <!-- Type definitions --> <xsd:complexType name="EntityType"> ! <xsd:sequence> ! <xsd:element name="id" type="xsd:long" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="progid" type="xsd:long" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> </xsd:complexType> --- 5,28 ---- $Id$ --> ! <xsd:schema ! xmlns:bpr="http://bprocessor.sourceforge.net" ! xmlns:xsd="http://www.w3.org/2001/XMLSchema" ! xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" ! xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" ! jaxb:extensionBindingPrefixes="xjc" ! jaxb:version="1.0"> ! ! <xsd:annotation> ! <xsd:appinfo> ! <jaxb:globalBindings> ! <xjc:typeSubstitution type="complex"/> ! </jaxb:globalBindings> ! </xsd:appinfo> ! </xsd:annotation> <!-- Type definitions --> <xsd:complexType name="EntityType"> ! <xsd:attribute name="id" type="xsd:long" use="required"/> ! <xsd:attribute name="progid" type="xsd:long" use="optional"/> </xsd:complexType> *************** *** 18,27 **** <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element ref="vertex" maxOccurs="1" minOccurs="0"/> ! <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> --- 30,39 ---- <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element ref="vertex" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> ! <xsd:attribute name="active" type="xsd:boolean" use="required"/> ! <xsd:attribute name="editable" type="xsd:boolean" use="required"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 31,42 **** <xsd:extension base="EntityType"> <xsd:sequence> - <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0"/> - <xsd:element name="type" type="xsd:int" maxOccurs="1" minOccurs="0"/> - <xsd:element name="level" type="xsd:int" maxOccurs="1" minOccurs="0"/> <xsd:element name="description" type="xsd:string" maxOccurs="1" minOccurs="0"/> <xsd:element name="Classification" type="xsd:string" maxOccurs="1" minOccurs="0"/> <xsd:element name="boundary" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> ! <xsd:element name="voidref" type="xsd:long" maxOccurs="1" minOccurs="0"/> ! <xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="surface" maxOccurs="unbounded" minOccurs="0"/> --- 43,50 ---- <xsd:extension base="EntityType"> <xsd:sequence> <xsd:element name="description" type="xsd:string" maxOccurs="1" minOccurs="0"/> <xsd:element name="Classification" type="xsd:string" maxOccurs="1" minOccurs="0"/> <xsd:element name="boundary" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> ! <xsd:element name="constructor" type="ConstructorType" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="surface" maxOccurs="unbounded" minOccurs="0"/> *************** *** 44,51 **** <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="line" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="point" maxOccurs="unbounded" minOccurs="0"/> - <xsd:element ref="coordinatesystem" maxOccurs="unbounded" minOccurs="0"/> </xsd:sequence> </xsd:extension> </xsd:complexContent> --- 52,60 ---- <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/> <xsd:element ref="material" maxOccurs="unbounded" minOccurs="0"/> </xsd:sequence> + <xsd:attribute name="type" type="xsd:int" use="required"/> + <xsd:attribute name="name" type="xsd:string"/> + <xsd:attribute name="voidref" type="xsd:long" use="required"/> + <xsd:attribute name="level" type="xsd:int" use="required"/> </xsd:extension> </xsd:complexContent> *************** *** 56,60 **** <xsd:extension base="EntityType"> <xsd:sequence> - <xsd:element name="constructor" type="xsd:boolean" maxOccurs="1" minOccurs="0"/> <xsd:element name="edgeref" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> <xsd:element name="hole" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/> --- 65,68 ---- *************** *** 65,69 **** <xsd:element name="backMaterial" type="xsd:long" maxOccurs="1" minOccurs="0"/> </xsd:sequence> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> --- 73,77 ---- <xsd:element name="backMaterial" type="xsd:long" maxOccurs="1" minOccurs="0"/> </xsd:sequence> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 75,81 **** <xsd:element name="from" type="xsd:long" maxOccurs="1" minOccurs="0"/> <xsd:element name="to" type="xsd:long" maxOccurs="1" minOccurs="0"/> - <xsd:element name="constructor" type="xsd:boolean" maxOccurs="1" minOccurs="0"/> </xsd:sequence> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> --- 83,89 ---- <xsd:element name="from" type="xsd:long" maxOccurs="1" minOccurs="0"/> <xsd:element name="to" type="xsd:long" maxOccurs="1" minOccurs="0"/> </xsd:sequence> ! <xsd:attribute name="constructor" type="xsd:boolean" use="required"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 84,92 **** <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element name="x" type="xsd:double"/> ! <xsd:element name="y" type="xsd:double"/> ! <xsd:element name="z" type="xsd:double"/> ! </xsd:sequence> </xsd:extension> </xsd:complexContent> --- 92,98 ---- <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:attribute name="x" type="xsd:double" use="required"/> ! <xsd:attribute name="y" type="xsd:double" use="required"/> ! <xsd:attribute name="z" type="xsd:double" use="required"/> </xsd:extension> </xsd:complexContent> *************** *** 96,106 **** <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:sequence> ! <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="R" type="xsd:float" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="G" type="xsd:float" maxOccurs="1" minOccurs="0"/> ! <xsd:element name="B" type="xsd:float" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> --- 102,110 ---- <xsd:complexContent> <xsd:extension base="EntityType"> ! <xsd:attribute name="name" type="xsd:string" use="required"/> ! <xsd:attribute name="R" type="xsd:float" use="required"/> ! <xsd:attribute name="G" type="xsd:float" use="required"/> ! <xsd:attribute name="B" type="xsd:float" use="required"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 128,136 **** <xsd:complexContent> <xsd:extension base="ConstructorType"> ! <xsd:sequence> ! <xsd:element name="onlyplane" type="xsd:boolean" maxOccurs="1" minOccurs="0"/> ! <xsd:element ref="ijn" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> --- 132,140 ---- <xsd:complexContent> <xsd:extension base="ConstructorType"> ! <xsd:sequence> ! <xsd:element ref="ijn" maxOccurs="1" minOccurs="0"/> ! </xsd:sequence> ! <xsd:attribute name="onlyplane" type="xsd:boolean" use="required"/> ! </xsd:extension> </xsd:complexContent> </xsd:complexType> *************** *** 148,154 **** <xsd:element name="vertex" type="VertexType"/> <xsd:element name="material" type="MaterialType"/> - <xsd:element name="line" type="LineType"/> - <xsd:element name="point" type="PointType"/> - <xsd:element name="coordinatesystem" type="CoordinateSystemType"/> <xsd:element name="origin" type="VertexType"/> <xsd:element name="direction" type="VertexesType"/> --- 152,155 ---- |
