X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=431fad5c735d7d408b1b795ed081eef7863a42c3;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=7780c06d8761ec96b2de174dabcd3f8521e55fe4;hpb=f8efe615d1c7d5c23fd838c1abcd77be542b154c;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 7780c06..431fad5 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -37,12 +37,9 @@
 												<xs:element name="structureState" minOccurs="0" maxOccurs="unbounded">
 													<xs:complexType>
 														<xs:simpleContent>
-															<xs:extension base="xs:string">
+														<xs:extension base="xs:string">
+														<xs:attributeGroup ref="jv:swingwindow"/>
 																<xs:attribute name="visible" type="xs:boolean"/>
-																<xs:attribute name="xpos" type="xs:int"/>
-																<xs:attribute name="ypos" type="xs:int"/>
-																<xs:attribute name="width" type="xs:int"/>
-																<xs:attribute name="height" type="xs:int"/>
 																<xs:attribute name="viewId" type="xs:string" use="optional">
 																	<xs:annotation>
 																		<xs:documentation>additional identifier which properly disambiguates
@@ -72,7 +69,7 @@
 																</xs:documentation></xs:annotation></xs:attribute>	
 																
 															</xs:extension>
-														</xs:simpleContent>
+												    </xs:simpleContent>
 													</xs:complexType>
 												</xs:element>
 											</xs:sequence>
@@ -138,6 +135,7 @@
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>
+						<xs:attributeGroup ref="jv:swingwindow"/>
 						<xs:attribute name="conservationSelected" type="xs:boolean"/>
 						<xs:attribute name="pidSelected" type="xs:boolean"/>
 						<xs:attribute name="bgColour" type="xs:string"/>
@@ -165,10 +163,6 @@
 						<xs:attribute name="showSequenceLogo" type="xs:boolean" use="optional" default="false"/>
 						<xs:attribute name="ignoreGapsinConsensus" type="xs:boolean" use="optional" default="true"/>
 						
-						<xs:attribute name="xpos" type="xs:int"/>
-						<xs:attribute name="ypos" type="xs:int"/>
-						<xs:attribute name="width" type="xs:int"/>
-						<xs:attribute name="height" type="xs:int"/>
 						<xs:attribute name="startRes" type="xs:int"/>
 						<xs:attribute name="startSeq" type="xs:int"/>
 						<xs:attribute name="fontName" type="xs:string"/>
@@ -187,7 +181,7 @@
 								</xs:documentation>
 							</xs:annotation>
 						</xs:attribute>
-					</xs:complexType>
+          </xs:complexType>
 				</xs:element>
 				<xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
@@ -199,27 +193,24 @@
 				</xs:element>
 				<xs:element name="tree" minOccurs="0" maxOccurs="unbounded">
 					<xs:complexType>
-						<xs:sequence minOccurs="0">
-							<xs:element name="title" type="xs:string"/>
-							<xs:element name="newick" type="xs:string"/>
-						</xs:sequence>
-						<xs:attribute name="width" type="xs:int"/>
-						<xs:attribute name="height" type="xs:int"/>
-						<xs:attribute name="xpos" type="xs:int"/>
-						<xs:attribute name="ypos" type="xs:int"/>
-						<xs:attribute name="fontName" type="xs:string"/>
-						<xs:attribute name="fontSize" type="xs:int"/>
-						<xs:attribute name="fontStyle" type="xs:int"/>
-						<xs:attribute name="threshold" type="xs:float"/>
-						<xs:attribute name="showBootstrap" type="xs:boolean"/>
-						<xs:attribute name="showDistances" type="xs:boolean"/>
-						<xs:attribute name="markUnlinked" type="xs:boolean"/>
-						<xs:attribute name="fitToWindow" type="xs:boolean"/>
-						<xs:attribute name="currentTree" type="xs:boolean"/>
-						<xs:attribute name="id" type="xs:ID" use="optional">
-							<xs:annotation><xs:documentation>Tree ID added for binding tree visualization settings to vamsas document trees in jalview 2.4.1</xs:documentation></xs:annotation>
-						</xs:attribute>
-					</xs:complexType>
+					 <xs:sequence minOccurs="0">
+              <xs:element name="title" type="xs:string"/>
+              <xs:element name="newick" type="xs:string"/>
+            </xs:sequence>
+            <xs:attribute name="fontName" type="xs:string"/>
+            <xs:attribute name="fontSize" type="xs:int"/>
+            <xs:attribute name="fontStyle" type="xs:int"/>
+            <xs:attribute name="threshold" type="xs:float"/>
+            <xs:attribute name="showBootstrap" type="xs:boolean"/>
+            <xs:attribute name="showDistances" type="xs:boolean"/>
+            <xs:attribute name="markUnlinked" type="xs:boolean"/>
+            <xs:attribute name="fitToWindow" type="xs:boolean"/>
+            <xs:attribute name="currentTree" type="xs:boolean"/>
+            <xs:attribute name="id" type="xs:ID" use="optional">
+              <xs:annotation><xs:documentation>Tree ID added for binding tree visualization settings to vamsas document trees in jalview 2.4.1</xs:documentation></xs:annotation>
+            </xs:attribute>
+          <xs:attributeGroup ref="jv:swingwindow"/>
+          </xs:complexType>
 				</xs:element>
 				<xs:element name="FeatureSettings" minOccurs="0">
 					<xs:complexType>
@@ -287,4 +278,27 @@
 		<xs:attribute name="type" type="xs:string" use="optional"/>
 		<xs:attribute name="file" type="xs:string"/>
 	</xs:complexType>
+	<!-- 
+	<xs:complexType name="reportWindow">
+	<xs:annotation>
+	<xs:documentation>Generic type for windows containing mime-typed data associated with other jalview windows</xs:documentation>
+	</xs:annotation>
+	<xs:sequence>
+	</xs:sequence>
+    <xs:attribute name="id" type="xs:string" use="required"/>
+    <xs:attribute name="type" type="xs:string" use="optional"/>
+    <xs:attribute name="file" type="xs:string" use="optional"/>
+	</xs:complexType>
+ -->
+    <xs:attributeGroup name="swingwindow">
+    <xs:annotation>
+    <xs:documentation>
+      base attributes for windows displayed in Jalview desktop.
+    </xs:documentation>
+    </xs:annotation>
+      <xs:attribute name="width" type="xs:int"/>
+      <xs:attribute name="height" type="xs:int"/>
+      <xs:attribute name="xpos" type="xs:int"/>
+      <xs:attribute name="ypos" type="xs:int"/>
+    </xs:attributeGroup>
 </xs:schema>