[Bprocessor-commit] model/src/etc bprocessor.xsd,1.18,1.19

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/etc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6739/src/etc

Modified Files:
	bprocessor.xsd 
Log Message:
Some way in the impl. of modellor to xml but not all so dont use load save (that is undo as well) when using modellors it will crash

Index: bprocessor.xsd
===================================================================
RCS file: /cvsroot/bprocessor/model/src/etc/bprocessor.xsd,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** bprocessor.xsd	9 Oct 2006 08:49:21 -0000	1.18
--- bprocessor.xsd	10 Oct 2006 14:04:45 -0000	1.19
***************
*** 13,16 ****
--- 13,17 ----
  	jaxb:version="1.0">
  
+   <!-- Needed for subtypeing -->
    <xsd:annotation>
      <xsd:appinfo>
***************
*** 23,39 ****
    <!-- 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>
- 
- 	<xsd:complexType name="ConstructorType">
      <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>
--- 24,32 ----
    <!-- Type definitions -->
    <xsd:complexType name="EntityType">
      <xsd:complexContent>
!       <xsd:extension base="Types">
!   	    <xsd:attribute name="id" type="xsd:long" use="required"/>
!   	    <xsd:attribute name="progid" type="xsd:long" use="optional"/>
!   	  </xsd:extension>
      </xsd:complexContent>
    </xsd:complexType>
***************
*** 47,50 ****
--- 40,44 ----
            <xsd:element name="boundary" type="xsd:long" maxOccurs="unbounded" minOccurs="0"/>
            <xsd:element name="constructor" type="ConstructorType" maxOccurs="unbounded" minOccurs="0"/>
+           <xsd:element name="modellor" type="ModellorType" maxOccurs="1" minOccurs="0"/>
            <xsd:element ref="space" maxOccurs="unbounded" minOccurs="0"/>
            <xsd:element ref="surface" maxOccurs="unbounded" minOccurs="0"/>
***************
*** 110,113 ****
--- 104,119 ----
    </xsd:complexType>
    
+ 	<xsd:complexType name="ConstructorType">
+     <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>
+   
    <xsd:complexType name="LineType">
      <xsd:complexContent>
***************
*** 141,147 ****
  
    <xsd:complexType name="VertexesType">
! 	  <xsd:sequence>
! 	    <xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
! 	  </xsd:sequence>
    </xsd:complexType>
  
--- 147,200 ----
  
    <xsd:complexType name="VertexesType">
! 		<xsd:sequence>
! 	  	<xsd:element ref="vertex" maxOccurs="unbounded" minOccurs="0"/>
! 		</xsd:sequence>
!   </xsd:complexType>
! 
! 	<xsd:complexType name="ModellorType">
! 		<xsd:complexContent>
!   		<xsd:extension base="EntityType">
! 				<xsd:sequence>
! 					<xsd:element name="attribute" type="MapElementType" maxOccurs="unbounded" minOccurs="0"/>
! 				</xsd:sequence>
! 				<xsd:attribute name="ty" type="xsd:string"/>
! 			</xsd:extension>
!   	</xsd:complexContent>
!   </xsd:complexType>
!   
!   <xsd:complexType name="Types">
!   </xsd:complexType>
!   
!   <xsd:complexType name="IntegerType">
!   	<xsd:complexContent>
!   		<xsd:extension base="Types">
!   			<xsd:sequence>
! 					<xsd:element name="integer" type="xsd:int" maxOccurs="1" minOccurs="1"/>
! 				</xsd:sequence>
!   		</xsd:extension>
!   	</xsd:complexContent>
!   </xsd:complexType>
!   
!   <xsd:complexType name="StringType">
!   	<xsd:complexContent>
!   		<xsd:extension base="Types">
!   			<xsd:sequence>
! 					<xsd:element name="string" type="xsd:string" maxOccurs="1" minOccurs="1"/>
! 				</xsd:sequence>
!   		</xsd:extension>
!   	</xsd:complexContent>
!   </xsd:complexType>
!   
!   <xsd:complexType name="MapElementType">
! 		<xsd:sequence>
! 	  	<xsd:element name="key" type="xsd:string" maxOccurs="1" minOccurs="1"/>
! 	  	<xsd:element name="value" type="Types" maxOccurs="1" minOccurs="1"/>
! 		</xsd:sequence>
!   </xsd:complexType>
! 
! 	<xsd:complexType name="TransformType">
! 		<xsd:sequence>
! 			<xsd:element name="content"/>
! 		</xsd:sequence>
    </xsd:complexType>