From: jprocter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 20 Sep 2005 09:42:33 +0000 (+0000)
Subject: refactored tree type to avoid conflicts.
X-Git-Tag: Release_0.2~487
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8a1f9ff655f209f63302c262331003681a9f60d3;p=vamsas.git

refactored tree type to avoid conflicts.


git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@33 be28352e-c001-0410-b1a7-c7978e42abec
---

diff --git a/schemas/vamsas15_9.xsd b/schemas/vamsas15_9.xsd
index 787a929..1a5ba63 100644
--- a/schemas/vamsas15_9.xsd
+++ b/schemas/vamsas15_9.xsd
@@ -10,12 +10,20 @@
 	</xs:complexType>
 	<xs:complexType name="VAMSAS">
 		<xs:sequence>
-			<xs:element name="Dendro" type="vamsas:TreeType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element ref="vamsas:SequenceSet" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
-		
-        <xs:attribute name="id" type="xs:ID"/>
+		<xs:attribute name="id" type="xs:ID"/>
     </xs:complexType>
+    <xs:element name="Tree">
+	 	<xs:complexType>
+	        <xs:sequence>
+    			<xs:element name="newickFormat" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
+        		<xs:element ref="vamsas:Provenance" minOccurs="1" maxOccurs="1"/>
+		    </xs:sequence>
+        	<xs:attribute name="id" type="xs:ID"/>
+    	</xs:complexType>
+	</xs:element>
 	<xs:element name="Provenance">
 		<xs:complexType>
 			<xs:sequence maxOccurs="unbounded">
@@ -74,7 +82,7 @@
 									<xs:attribute name="id" type="xs:ID"/>
 								</xs:complexType>
 							</xs:element>
-							<xs:element name="tree" type="vamsas:TreeType" minOccurs="0" maxOccurs="unbounded"/>
+							<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
 							<xs:element name="alignmentSequence" minOccurs="2" maxOccurs="unbounded">
 								<xs:complexType>
 									<xs:complexContent>
@@ -88,7 +96,7 @@
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="tree" type="vamsas:TreeType"/>
+				<xs:element ref="vamsas:Tree" minOccurs="0" maxOccurs="unbounded"/>
 				<xs:element ref="vamsas:Provenance"/>
 			</xs:sequence>
 			<xs:attribute name="gapChar" type="xs:string" use="required"/>
@@ -132,13 +140,6 @@
 		<xs:attribute name="id" type="xs:ID"/>
 	</xs:complexType>
 	
-    <xs:complexType name="TreeType">
-        <xs:sequence>
-          <xs:element name="newickFormat" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:element ref="vamsas:Provenance" minOccurs="1" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
     <xs:complexType name="ApplicationData">
 		<xs:sequence>
 			<xs:element name="Application">